From 929a544c54c2bdc3c9b99b8650970199e6d3c3fc Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 16 Jul 2024 07:43:45 -0500 Subject: [PATCH] Better response variable name db_changed -> report_success --- src/pgwui_copy/templates/copy.mak | 4 ++-- src/pgwui_copy/views/copy.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pgwui_copy/templates/copy.mak b/src/pgwui_copy/templates/copy.mak index 8cc4881..dde449b 100644 --- a/src/pgwui_copy/templates/copy.mak +++ b/src/pgwui_copy/templates/copy.mak @@ -1,5 +1,5 @@ <%doc> - Copyright (C) 2014, 2015, 2018, 2021 The Meme Factory, Inc. + Copyright (C) 2014, 2015, 2018, 2021, 2024 The Meme Factory, Inc. http://www.karlpinc.com/ This file is part of PGWUI_Copy. @@ -26,7 +26,7 @@ havecreds Already logged in crfs_token user - db_changed (used by base.mk) + report_success (used by base.mk) schema from_db diff --git a/src/pgwui_copy/views/copy.py b/src/pgwui_copy/views/copy.py index ade5414..2f29414 100644 --- a/src/pgwui_copy/views/copy.py +++ b/src/pgwui_copy/views/copy.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015, 2018, 2020, 2021 The Meme Factory, Inc. +# Copyright (C) 2015, 2018, 2020, 2021, 2024 The Meme Factory, Inc. # http://www.karlpinc.com/ # This file is part of PGWUI_Copy. @@ -187,13 +187,13 @@ class CopySchemaHandler(SessionDBHandler): Returns: Dict pyramid will use to render the resulting form Reserved keys: - errors A list of UploadError exceptions. - db_changed Boolean. Whether the db was changed. + errors A list of UploadError exceptions. + report_success Boolean. Whether the copy succeeded. ''' response = super().write(result, errors) - response['db_changed'] = (not response['errors'] - and self.uf['action'] != '') + response['report_success'] = (not response['errors'] + and self.uf['action'] != '') return response @@ -628,7 +628,7 @@ def copy_schema_view(request): drop_handler = DropSchemaHandler(request) drop_handler.init() response, errors = ToDBEngine(drop_handler).run() - if response['db_changed']: + if response['report_success']: # Copy schema to target db. try: copy_schema(from_handler.uf, settings['pgwui']) @@ -645,7 +645,7 @@ def copy_schema_view(request): from_handler.uf['schema']), db=markupsafe.escape(from_handler.uf['to_db'])))) response['errors'].extend(copyerrors) - response['db_changed'] = False + response['report_success'] = False else: schema = markupsafe.escape(from_handler.uf['schema']) to_db = markupsafe.escape(from_handler.uf['to_db']) -- 2.34.1